merge trunk
authorKenichi Handa <handa@etlken>
Thu, 6 May 2010 00:50:39 +0000 (09:50 +0900)
committerKenichi Handa <handa@etlken>
Thu, 6 May 2010 00:50:39 +0000 (09:50 +0900)
commitf6e1c5151cd2e163230c5f9417e76bf85f2a8230
tree4352e0fc467a95075f2fba4ba88dfc35013dbccf
parent5a07ecede8c0d52760079733cc392b7e91771767
parent3121b42b7591ddf8df0c999c30993536499149e6
merge trunk